Add cross-platform Swift package tests for macOS by jkmassel · Pull Request #25344 · wordpress-mobile/WordPress-iOS

jkmassel · 2026-03-04T06:01:28Z

Summary

Migrating to swift test (as suggested by @mokagio) for our logic tests has been a goal for a while, but it has to be done incrementally. It turns out it's not too hard to get started (this PR has very few code changes aside from new import statements), and as a module is made cross-platform, we just add it to the project's root Package.swift file and CI will enforce that it stays that way. We can use the same approach for Swift 6 compatibility.

There's a ton of other stuff I wanted to do that I left out of this PR like:

Combining WordPressCore and WordPressShared (now that they can both be tested using swift test)
Cleaning up some warnings in the swift test output
Running around the codebase and cleaning up other spurious import UIKit usage

Instead, this PR is pretty focused, and just starts us off by:

Adding a root-level Package.swift so modules can be built and tested on macOS with swift test (no Xcode required)
Splitting WordPressSharedObjC and WordPressShared into cross-platform core modules and UIKit-only modules (WordPressSharedObjCUI, WordPressSharedUI)
Decoupling WordPressKit from UIKit by introducing a DeviceInformationProvider protocol (which UIDevice conforms to on iOS) and guarding UIKit-only code with #if canImport(UIKit)
Adding a Buildkite CI step that runs swift test on every PR

Currently 15+ modules and 53 tests across 7 suites run on macOS. As more modules are made cross-platform, they can be added to the root package.

Test plan

swift test passes locally with 53 tests in 7 suites
Buildkite "Swift Package Tests" job passes on CI
Existing Xcode builds and tests are unaffected

🤖 Generated with Claude Code

dangermattic · 2026-03-04T06:02:07Z

	2 Warnings
⚠️	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2026-03-04T06:10:14Z

🤖 Build Failure Analysis

This build has failures. Claude has analyzed them - check the build annotations for details.

wpmobilebot · 2026-03-04T20:06:19Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Configuration	Release-Alpha
	Build Number	`31355`
	Version	`PR #25344`
	Bundle ID	`com.jetpack.alpha`
	Commit	`fc94073`
	Installation URL	4qn4l7l512o20

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-03-04T20:06:23Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Configuration	Release-Alpha
	Build Number	`31355`
	Version	`PR #25344`
	Bundle ID	`org.wordpress.alpha`
	Commit	`fc94073`
	Installation URL	4a3l0jqp1n000

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

Defines a subset of modules that build and test on macOS without Xcode, enabling `swift test` from the repo root. Modules can be incrementally added here as they become cross-platform. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…o cross-platform package Replace unnecessary UIKit imports with Foundation in Obj-C headers that only use Foundation types. Remove stale UIKit import from FeatureFlagRemote.swift. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Create WordPressSharedObjCUI and WordPressSharedUI for UIKit-dependent code, keeping WordPressSharedObjC and WordPressShared cross-platform. Update all import statements across the codebase accordingly.

Introduce DeviceInformation struct to replace direct UIDevice usage in NotificationSettingsServiceRemote. Use ProcessInfo for OS version in SessionDetails. Guard UIKit-only code with #if canImport(UIKit) in HTTPAuthenticationAlertController, UIDevice+Extensions, NSMutableParagraphStyle+extensions, GravatarServiceRemote (upload), PluginDirectoryEntry (HTML text extraction), and SiteDesignServiceRemote (screen scale). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add WordPressSharedObjC, WordPressShared, WordPressKit, and WordPressSharedTests to the root Package.swift for macOS testing. Fix cross-platform build issues: remove unused MobileCoreServices import from URL+Helpers, guard String.accessibilityLabel usage in Double+Stats with #if canImport(UIKit), and remove unused WordPressSharedObjC import from String+RemovingMatches. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Runs `swift test` from the repository root to verify that cross-platform modules build and pass tests on macOS without Xcode. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add explicit `as [Target.Dependency]` annotations to the larger dependency arrays. This helps the Swift compiler type-check the Package() expression within its time limit after the addition of WordPressSharedUI and WordPressSharedObjCUI targets. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sonarqubecloud · 2026-03-05T03:37:37Z

Quality Gate passed

Issues
20 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

kean · 2026-03-05T23:00:23Z

There are some great changes to clean up the targets in this PR; however, I'm not completely confident that making swift build work is an optimal goal for the following reasons:

Xcode 26.3 MCP uses Xcode Targets to build and test the app.
It's an iOS app, so you need to build for iOS during development and testing, especially for targets like WordPressUI and JetpackStats. Only a subset of the internal modules are genuinely cross-platform. Most of the code in the app is view-layer code. The trend is to move cross-platform code to Rust and move view code to SwiftPM modules.
The addition of macOS compatibility creates a maintenance burden.

It may still be useful to support swift build in some scenarios, but I'm not quite sure how often you'd need it in practice.

kean · 2026-03-05T23:34:33Z

Modules/Sources/WordPressSharedUI/ReachabilityUtils+Alert.swift

+import Foundation
+import WordPressShared
+
+extension ReachabilityUtils {


I'd suggest moving those to WordPressUI as opposed to creating a new module WordPressSharedUI.

kean · 2026-03-05T23:35:22Z

Just to clarify – no questions about targets that are genuinely cross-platform, but I'm not sure how many there are except for WordPressShared, WordPressKit, and WordPressData.

jkmassel force-pushed the jkmassel/macos-swift-test branch from 0be8eea to 0eae085 Compare March 4, 2026 19:53

jkmassel force-pushed the jkmassel/macos-swift-test branch 9 times, most recently from 25024a8 to dd39a13 Compare March 5, 2026 03:28

jkmassel and others added 2 commits March 4, 2026 20:31

jkmassel force-pushed the jkmassel/macos-swift-test branch from dd39a13 to 34fe73f Compare March 5, 2026 03:31

jkmassel and others added 5 commits March 4, 2026 20:33

Split WordPressShared into cross-platform and UIKit-only modules

0397bde

Create WordPressSharedObjCUI and WordPressSharedUI for UIKit-dependent code, keeping WordPressSharedObjC and WordPressShared cross-platform. Update all import statements across the codebase accordingly.

Add Buildkite job to run cross-platform Swift package tests

81f8a56

Runs `swift test` from the repository root to verify that cross-platform modules build and pass tests on macOS without Xcode. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

jkmassel force-pushed the jkmassel/macos-swift-test branch from 34fe73f to fc94073 Compare March 5, 2026 03:34

jkmassel added this to the 26.8 milestone Mar 5, 2026

jkmassel self-assigned this Mar 5, 2026

jkmassel added Testing Unit and UI Tests and Tooling [Type] Enhancement labels Mar 5, 2026

jkmassel requested review from kean and mokagio March 5, 2026 03:38

jkmassel marked this pull request as ready for review March 5, 2026 04:04

jkmassel removed the [Type] Enhancement label Mar 5, 2026

kean reviewed Mar 5, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add cross-platform Swift package tests for macOS#25344

Add cross-platform Swift package tests for macOS#25344
jkmassel wants to merge 7 commits intotrunkfrom
jkmassel/macos-swift-test

jkmassel commented Mar 4, 2026 •

edited

Loading

Uh oh!

dangermattic commented Mar 4, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 4, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 4, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 4, 2026 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Mar 5, 2026

Uh oh!

kean commented Mar 5, 2026 •

edited

Loading

Uh oh!

kean Mar 5, 2026 •

edited

Loading

Uh oh!

kean commented Mar 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jkmassel commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

dangermattic commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Build Failure Analysis

Uh oh!

wpmobilebot commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sonarqubecloud bot commented Mar 5, 2026

Quality Gate passed

Uh oh!

kean commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kean Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kean commented Mar 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jkmassel commented Mar 4, 2026 •

edited

Loading

dangermattic commented Mar 4, 2026 •

edited

Loading

wpmobilebot commented Mar 4, 2026 •

edited

Loading

wpmobilebot commented Mar 4, 2026 •

edited

Loading

wpmobilebot commented Mar 4, 2026 •

edited

Loading

kean commented Mar 5, 2026 •

edited

Loading

kean Mar 5, 2026 •

edited

Loading